Merge branch 'master' into develop
Add a nice message when comments are disabled
Merge branch 'develop'