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

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