Improved history directive: now works as expected
Merge remote-tracking branch 'origin/master'