Merging develop to master

Trailing whitespace detected.