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