More player movement improvements
Merge branch 'sander'
Merge branch 'ferrybig'