Merge branch 'master' of https://github.com/antidau/rallye-common into gradle
Merge branch 'gradle'