Merge branch 'gh-pages'
collision detection
Merge branch 'master' into gh-pages