Merge branch 'release-4.3'

Use the `-s ours` merge strategy because this update to `release-4.3`
makes changes we only want in 4.3 and not `master`.