Comment 1 for bug 1336561

Tracked down the differences between trunk and experimental, and found that Jabier fixed this bug perhaps without knowing :-)

Committed to trunk in rev. 13445