Created attachment 3516 [details] [review] Proposed Patch
Created attachment 4019 [details] [review] patch signed-off
Pushed to master, please test
There have been no further reports of problems so I am marking this bug resolved.