Support --no-ff
Merge branch 'master' into gh-pages