Merge branch 'master' into 'develop'

# Conflicts:
#   Dockerfile
2 jobs for develop in 33 seconds (queued for 1 second)
Status Job ID Name Coverage
  Check Style
passed #3227
docstyle

00:00:27

passed #3226
pep8

00:00:33