Make merges slightly easier by reducing one conflict source.
Pull-Request has been merged by dcavalca
Make merges slightly easier by reducing one conflict source.