80853a2238
Co-authored-by: Lauris BH <lauris@nix.lv> (cherry picked from commit 38c773d8a5d6168ebb3030513a6063381976bd22) Co-authored-by: zeripath <art27@cantab.net>