Merge branch 'master' into 'master'

Container cleanup

See merge request !58
2 jobs for master in 2 minutes and 7 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #249818
docker:master

00:01:45

 
  Test
passed #249819
test:master

00:00:21