Backport of ae0cb2 from master

I plan to do a point release for 1.9.4 in the next weeks.
And that is much nicer if the tests are reliable.