Changed gitian compilation
Merge remote-tracking branch 'remotes/upstream/master' into master-nominer

Conflicts:
	contrib/gitian-descriptors/windows/gitian-win-darkcoin.yml