Merge branch 'dev' into 'master'

Add support for branch subdirectories

See merge request chris/pages-test!1