Merge branch 'master' into 'develop'

# Conflicts:
#   build.gradle
Status Job ID Name Coverage
  Test
passed #135
dua-fehlertls-build

00:01:03