Merge "Fix phpstorm IDEA errors in SkinTemplate"