Apply Colin's local modifications
Merge branch 'master' into original

Conflicts:
	src/generator/Generator.cs