Merge in Travis branch.