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

Conflicts:
	README.md