Applied to master, maint-6.0 and hardened-builds (commits cdf765fea083b4c359b30e2d0d3860d1ce43202b, 30dd056dcbabc341920db1c008b53f039c4aa408, and be01f6cdcddc438f8fb9032a73bab7c291a16c9a), thanks.
Trac: Status: needs_review to closed Resolution: N/Ato fixed