Merge gh-pages-dev into gh-pages for version 1.2.0 release