Merge branch 'master' into 'dev'

Update Dockerfile See merge request !1
1 job from dev in 2 minutes 47 seconds
Status Job ID Name Coverage
  Pre Deploy
passed #28320
docker-image-builder
build_docker_image

02:47