Odoo Server (MOVED TO GITHUB)

Merge proposals dependent on lp://qastaging/~dobtor/openobject-server/trunk-bugfix-1213683

  1. trunk-bugfix-1213683
  2. Dependent merge proposals

lp://qastaging/~dobtor/openobject-server/trunk-bugfix-1213683 has no merge proposals.