merge from PlayerRigUpdate2/Hair_Fixes