example
merge branch 'master' into gh-pages