Created attachment 49970 [details, diff] patchfi.patch
Created attachment 49971 [details, diff] patchfi.patch
Committed, thanks :)