95f8558 Backport of fix for bugreport #1202105

Authored and Committed by germano 6 years ago
    Backport of fix for bugreport #1202105