Merge branch 'develop' into 43-multi-threading

Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
3 jobs for 43-multi-threading in 3 minutes and 4 seconds (queued for 5 seconds)