Merge branch '2.066'

Conflicts:
	windows/d1-installer.nsi
	windows/dmc-installer.nsi