Merge branch 'static-pages' to master