Travis

As requested to 2.1 branch.