Merge branch 'docker-test' into 'master'

Automatic docker builds

See merge request !86
8 jobs for master in 11 minutes and 35 seconds (queued for 2 seconds)