Commit f9317a6a authored Dec 06, 2019 by Björn Bartels

Merge branch 'bartels-master-patch-31355' into 'master'

Bartels master patch 31355

See merge request !3