Hg: Merge in upstream RA changes
--HG-- extra : convert_revision : af4f49d24c27fe4b0e745138baf659e27def61bd