Unbind Map object with direct key
Merge pull request #737 from fmeurisse/master

[#1791] Unbind Map object with direct key