deserialize null collections as empty collections
Merge remote-tracking branch 'origin/master'