Manually merge some changes from testing into master.