Merge "Work around &$this usage in SkinTemplate"