Fix #1418 (problem with JSON unflatten when using common prefixes)
Merge pull request #1419 from obruchez/master

Fix #1418 (problem with JSON unflatten when using common prefixes)