Please slow down with the merges so issues like these get caught by Travis