Merge remote-tracking branch 'upstream/master'

Conflicts:
	Readme.md
	bin/compile