Player stops moving animation-wise
Merge remote-tracking branch 'origin/master'