added special merge behavior for empty objects and arrays to allow setting empty objects and arrays
Merge branch 'peter/validate-attributes'
0.3.15