Merge remote-tracking branch 'upstream/master' into tasks

# Conflicts:
#	build.gradle
Status Job ID Name Coverage
  Build
canceled #111
build

 
  Test
canceled #113
allowed to fail
code_quality

canceled #112
test