Enable savehist-mode by default (though M-x already had a history)
Merge remote-tracking branch 'upstream/master'