Merge "rename vars in SkinTemplate::outputPage()"