Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	README.md
Fixing merges, etc.