Merge remote-tracking branch 'origin/master' into WIP/win-deps

Conflicts:
	OpenApoc.vcxproj
Merge branch 'WIP/win-deps' of https://github.com/JonnyH/OpenApoc into WIP/win-deps