Merge branch 'good_hist' into gmaster

A force push to master rewrote history and dropped these commits.
We need to add them back.
tree: b5116d1a197e738002d8e2bc0a52732486a36850
  1. pkgs/