Removed trailing spaces.
Merge branch 'dev'