Update `master` with v1.4.x changes

Mostly just for the site and History file.