Modified syntax in player.cpp, did not change behavior.
Merge remote-tracking branch 'origin/master'