Final changes to static pages
Merge branch 'static-pages'