We are doing this merge to avoid taking the patch from "nickm/disable_pathbias_warnings_v2" into 0.2.4 -- we're going to try to fix the pathbias code for real here.