Use deep-merge with fix for merging array correctly.
Merge remote-tracking branch 'origin/master'