history: fix warning display.
Merge branch 'history' into staging