listening to hlint.
whitespace
Merge branch 'master' into develop