allow travis build on 1.1
Merge branch 'master' into 1.1