Merge proposals dependent on lp://qastaging/~raoul-snyman/openlp/fix-retvalue

lp://qastaging/~raoul-snyman/openlp/fix-retvalue has no merge proposals.