Merged changes in main_template from Plone 4.3.2