Merge branch 'master' into develop
Merge pull request #1 from marein/develop

Merge branch 'master' into develop