Don't blindly combine values of duplicate keys.
Merge branch 'fix-issue-73' into development