Merge branch 'master' into T27229-Add_locale_awareness
Signed-off-by: Ralf Floca <r.floca@dkfz-heidelberg.de>