Merge branch 'master' into develop
intermediate commit (curly brackets problem)
Merge branch 'develop'