Object.merge should skip non-objects
Object.merge should skip non-objects


Former-commit-id: 74379c5f54de1333bc187add631632b74c9bffbc [formerly 39c6b231a78b5b4819c5034d698b2af4e5edd5c5]
Former-commit-id: b3ef3bb4a8c23e6d7c7028723378c7f5890b578d
romancow/Sugar,andrewplummer/Sugar,andrewplummer/Sugar,romancow/Sugar