Merge remote-tracking branch 'origin/master' into anehmer/integration

Signed-off-by: Alexander Nehmer <a.nehmer@science-computing.de>