Merge proposals dependent on lp:~hbrunn/ocb-addons/trunk_lp1237832

lp:~hbrunn/ocb-addons/trunk_lp1237832 has no merge proposals.