Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.gitlab-ci.yml
#	Dockerfile
3 jobs for master in 3 minutes and 1 second (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #758
docker-build

00:01:31

 
  Delete
passed #759
allowed to fail
delete-old-container

00:00:50

 
  Deploy
passed #760
docker-deploy

00:00:38