Merge "Update formatting for PHP files in skins/"