Merge branch 'static-pages'