Merge branch 'master' of git8.cs.fau.de:software/cool into modcheck

16 jobs for modcheck in 2 minutes and 24 seconds (queued for 2 seconds)