orphan spaces cleanup ;-)
Merge pull request #3258

fabba0e orphan spaces cleanup ;-) (Philip Kaufmann)