Marlin

Merge proposals dependent on lp://qastaging/~mathijshenquet/marlin/history-spc-segfault

  1. history-spc-segfault
  2. Dependent merge proposals

lp://qastaging/~mathijshenquet/marlin/history-spc-segfault has no merge proposals.