Merged in upstream changes.
--HG-- extra : convert_revision : 6890a1f01de4a5ed71a99fa1a7b27cd3694e9649