Merge branch 'master' into develop
Fix typo
Merge branch 'develop'
Fix coderay formatting.g
Merge branch 'develop'