Possible fix for previewing pages with inherited templates.
Merge pull request #2388 from Rakoth/master

Possible fix for previewing pages with inherited templates.