Rebase from 'upstream'
Trimmed the branch to only the play_motion sub directory