Merge "Skin.php: HTML escape message pipe-separator"