Remove trailing whitespace
Merge branch 'whitespace' into polytrix