Merge proposals dependent on lp:~dex-phx/openobject-server/trunk-ajm

lp:~dex-phx/openobject-server/trunk-ajm has no merge proposals.