GitLab

This reverts commit bb524924.
This is necessary to allow running "make" in subdirs again.

Conflicts:

	Makefile