For some reason this patch got corrupted in transit. Not sure why. Recreated it, and patched upstream here: http://git.zx2c4.com/password-store/commit/?id=bdc0960d68d2ab6e4f078356092f97ccae15f0b4