merge-upstream: re-merge ae75a7b

something went wrong on the original merge, and we didn't actually
bring in all the old commits. with this we should have all the commits
brought into our tree with no actual changes as we already did the
merge.