Empty arrays are handled correctly now (#2034)
Merge remote-tracking branch 'origin/master'