Merge branch 'master' into thesisCodeCorrection

1 job for thesisCodeCorrection in 1 minute and 38 seconds (queued for 7 seconds)