Merge branch 'master' into 'develop'

# Conflicts:
#   build.gradle
1 job for develop in 1 minute and 3 seconds (queued for 15 seconds)
Status Job ID Name Coverage
  Test
passed #135
dua-fehlertls-build

00:01:03