Add travis-ci config
Merge branch 'master' into 2.x