Merge branch 'hotfix/7.x-2.9' into develop
Developing travis
Merge branch 'release/7.x-2.10'