Created attachment 12334 [details]
Patch for 4.5rc
Please apply to 4.5 after BZ12121 - applying in BZ number order is easiest :-)
Here are patches for v4-5.
(In reply to Amitay Isaacs from comment #2)
Pushed to autobuild-v4-5-test.
(In reply to Karolin Seeger from comment #3)
Pushed to v4-5-test.
Closing out bug report.