Merge branch 'hotfix/gradle_upgrade' into develop
Merge branch 'master' of https://github.com/zeplin/rally