Combined diff processing improved
Updated msysgit to 1.8.3
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Updated msysgit to 1.8.3
  Combined diff processing improved