put back in special case for going down to fill a row
Merge remote-tracking branch 'origin/master'