Merge in Travis's changes