re-fix
Merge branch 'mass-copy' into mass-copy-nocopy

Conflicts:
	scripts/appveyor-tool.ps1