remove trailing spaces; for great justice.
Merge branch 'dev' into test