Comment 21 for bug 1715433

Hi Maren. Fixed #20 in the commit "3e9296b964" from today.
About 0.92.x I need to test the patch I put previously, not sure if is posible a refactor like the one done in trunk can be done for 0.92.x. ¿Anyone could give me green card to backport it?