hm. that's a pretty big commit... a bit uncomfortable cherry-picking it. might just lazily see if travis stays green in the branch, and not pick.