fixes, cleanups - 3.9.1
Merge remote-tracking branch 'upstream/master' into New-Generation

Conflicts:
	README