Merge proposals dependent on lp://qastaging/~phill-ridout/openlp/fixes-IV

lp://qastaging/~phill-ridout/openlp/fixes-IV has no merge proposals.