Edited test so jump physics uses better parameters
Merge remote-tracking branch 'origin/master'