Backport some useful branch changes to master.