safe deepmerge
Merge pull request #542 from Zolmeister/development

safe deepmerge