Remove trailing whitespace.
Merge branch 'master' into demo