Merge branch 'master' of git.martlubbers.net:clean-tests into master