Updated build (both Travis and Gradle configuration)
Merge remote-tracking branch 'origin/master'