More whitespace trimming I missed
Merge branch 'develop'

* develop:
  More whitespace trimming I missed