[Bug 40370] Merge r351504 to the 8.0 branch

[bugzilla-daemon]

Hans Wennborg changed bug 40370

What	Removed	Added
Status	NEW	RESOLVED
Resolution	—	FIXED

Comment # 1 on bug 40370 from Hans Wennborg

Merged in r351536.