revert back to working tno version
Merge branch 'master' of github.com:euphorie/osha.oira

Conflicts:
	docs/changes.rst