Summary of changes: 2461d6e... Remove unused patch (*) c044f92... Update to 0.20.4. (*) d757c80... Fix merge conflicts. (*) This commit already existed in another branch; no separate mail sent