Merge 2196

This pr simply merges #2196 with the current master.
Could be == null, but not a huge deal. Could also use that new `_.getDeep`