New static pages
Merge branches 'master' and 'new-static-pages'