put the page type select element into a separate template
Merge branch 'maint-rel-1.6' into develop