Merge branch 'master' into developer

Conflicts:
	README.org
hey