motor fix
Merge branch 'master' of github.com:locked/4stability

Conflicts:
	record.py