(Merge 3.1) Issue #9756: credit the author, Andreas Stührk (Trundle)