Merge branch 'master' into 'paper'

# Conflicts:
#   Makefile

Makefile

@@ -129,6 +129,6 @@ docker: .docker
 	touch .docker
 
 with-docker: | docker
-	docker run -v ${PWD}:/build:rw $${DOCKER_TAG:-itt:latest} "make -C /build $(RULE)"
+	docker run --rm -v ${PWD}:/build:rw $${DOCKER_TAG:-itt:latest} "make -C /build $(RULE)"
 
 .PHONY: paper presentation mindmap clean docker polish