Merge branch 'master' of i10git.cs.fau.de:da15siwa/lssthesis-memoir

2 jobs for master in 24 minutes and 39 seconds (queued for 1 second)