Merge proposals dependent on lp:~trb143/openlp/latest-fixes

lp:~trb143/openlp/latest-fixes has no merge proposals.