Merge branch 'release-1.1'
Changed transport wording.
Merge branch 'hotfix-wording' into develop