Merge "Split SkinTemplate.php per-class"