Merg request from willmot to fix fallback of custom page template.