Fix  whitespace
Merge branch 'fixes/whitespace' into up-master