Intermediate checkin, preparing to merge master into playercontrol