Merge remote-tracking branch 'origin/patch-2'

Conflicts:
	bin/compile