Cherry-picking 64fe266 into the 1.6 branch?

[Raphael Kubo da Costa]

Milian Wolff <mail at milianw.de> writes:

> I'll do that now.

Thanks a lot! It looks like e22b2e5 also needs to be cherry-picked to
fix the build.