Fixed ktrod's mess up in turns
Merge remote-tracking branch 'origin/master'