Merge pull request #1187 from etimberg/fix/config-merge-clone

Fix an error when merging null config values