Consistent spacing
Merge remote-tracking branch 'cboden/master'

* cboden/master:
  Consistent spacing