Merge proposals dependent on lp://qastaging/~tomasgroth/openlp/25bugfixes2

lp://qastaging/~tomasgroth/openlp/25bugfixes2 has no merge proposals.