er... actually, @red-balloon-89377: you still have review feedback there. recommend rebasing to latest master, applying feedback, and then seeing what happens in travis.