Trailing spaces
Merge branch 'master' into DEVIDM-54