Merge branch 'static-pages'
Merge branch 'master' into static-pages