spacing cleanup
Merge pull request #2947 from briankiewel/patch-1

spacing cleanup
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  spacing cleanup