Add .travis.yml
Merge branch '1.5' into 1.6