ConflictData minor refactoring
MSysGit updated to version 1.9.4-preview20140929. Closes #2468
Mono solution fixed
Read the stdOut and the stdErr before waiting for the process exit. Closes #2448.
Merge remote-tracking branch 'refs/remotes/origin/release/2.48' into release/2.48

Conflicts:
	Setup/DownloadExternals.cmd
	Setup/Product.wxs