Second fix for BT#7413
Merge pull request #225 from robertglez/1.9.x

Second fix for BT#7413