Fix git log pretty format argument
Merge remote-tracking branch 'upstream/master'