Remove insignificant spaces
Merge branch 'master' into 1-0-beta