Comment 4 for bug 1607937

Gunnar, I suspect this is fixed with

Could you test to see if that commit fixes this bug?

Then please evaluate whether it's better to backport that commit to xenial or backport 3.20.2 instead. If you think 3.20.2 makes sense for xenial, then please link to the NEWS file in this bug's description.