Fix for Bug 98940

[Matteo Casalin]

Hi everybody,
    I submitted to gerrit a one-line fix for bug 98940, a regression introduced by a previous commit of mine.
I think it's quite safe to push it to master, and I will do that in a few days unless someone reviews/pushes it in the meantime.

The aforementioned bug, however, affects the 5.1 branch and should be evaluated for backporting: what is the best approach to be followed for this?

Thanks in advance and kind regards
Matteo