Fix pump not passing through air blocks
Merge remote-tracking branch 'up/master'