Correcting messages
Merge branch 'master' into gh-pages
Merging & building changes in master