git is awful
Merge remote-tracking branch 'upstream/master'
Merge branch 'FirstVersionWithLogging' into masstransit