Merge branch 'master1' into gh-pages