Merge remote-tracking branch 'origin/master' into development

Conflicts:
	README.md
Merge remote-tracking branch 'upstream/development'

Conflicts:
	README.md