Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'gh-pages'
Revert "bike rename"

This reverts commit 675d81182f1803a0f8198dbac874fca91e79f41d.