Fixed rotation issues with players.
Merge