Don't assume a pull/merge strategy
Merge branch 'master' into gh-pages