Merge dev with local changes.
--HG-- extra : convert_revision : c39f9f5f17eb08f0e8d162fbcb782b9fc04db074