Merge trunk up to 43069, putting re.py back and hopefully making the branch

usable again.