Better history dump
Merge branch 'master' into timebox