Merge branch 'master' of dbgit.prakinf.tu-ilmenau.de:code/pfabric

3 jobs for master in 32 minutes and 2 seconds (queued for 2 seconds)