Bump version number
Merge branch 'release/v1.1' into develop
Track the correct branch build from travis.