Merge branch 'patch-1' into 'master'

Martin Nolterequested to merge
cherry-pick-f0d33bc3 into releases/2.6

Dedication to E. Pipping

See merge request !427 (merged)

(cherry picked from commit f0d33bc3)

b44118cc Dedication to E. Pipping

Merge request reports