Therp Backports (Deprecated)

Merge proposals dependent on lp://staging/~therp-nl/therp-backports/6.1_fix_949078_and_1023047

  1. 6.1_fix_949078_and_1023047
  2. Dependent merge proposals

lp://staging/~therp-nl/therp-backports/6.1_fix_949078_and_1023047 has no merge proposals.