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

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