Created attachment 3688 [details] [review] Proposed patch
This problem still exists in master. The attached patch does no longer apply.
Created attachment 4147 [details] [review] Proposed patch (3.4) Corrected patch with TT for 3.4
Created attachment 4185 [details] [review] Signed patch
Small patch, pushed to master please test
Verified, everything ok.