remove unnecessary filtering of nils (hickory does this already)
Merge remote-tracking branch 'origin/master'