Commit of code that was submitted
Merge branch 'master' of github.com:hardbot/mocha

Conflicts:
	osprd.c