Darker history
Merge branch 'persistent-history'

* persistent-history:
  Darker history