Include additional info for history
Merge remote-tracking branch 'upstream/master'