Merged in upstream changes...
--HG-- extra : convert_revision : aa7230f943d824e0ffd2275b97252ec3a314fb30