Add Travis config
Merge branch 'master' into v3.x