fix build
Merge remote-tracking branch 'origin/master' into ci-server

* origin/master:
  fix build

Conflicts:
	build.gradle