Motion is pretty good. No known bugs.
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/player.js