Merge origin/master

Conflicts:
	README.md
Merge origin/1.4 into 1.4