Merge branch 'master' into gh-pages
Register button :)
Merge branch 'gh-pages'