fix comment
remove trailing space
Merge branch 'master' into develop
remove trailing spaces