Adding missing _ dependency
Merge remote-tracking branch 'upstream/master'