Fix bad merge
Fix bad merge
Merge remote-tracking branch 'origin/master' into gh-pages