Merge eDir88 changes with dev.
--HG-- extra : convert_revision : f885067d02326aec28163318d7605aacb1b65a2f