Merge in latest skin changes @ 99a4c5d56ea23434215a2a28267a80f22d176b7c