GitLab

Copied relevant changes from commit 028d478f which was never merged from an old branch. (Did not merge because half the commit was irrelevant).