Added by Thomas Schöpping about 5 years ago
Merge remote-tracking branch 'origin/master' into SSSPwoBLT