Merge branch 'imaps-deletemap'