Merge branch 'master' into gh-pages
Setup for staging.
Setup for staging.