trying to rebase

trying to rebase
Merge branch 'master' into gh-pages