Merge branches 'gh-pages' and 'master' into gh-pages
Added support for different bases
Merge branch 'gh-pages'