Finish static pages
Merge of static page completion
Merge branch 'static-pages'