Merge proposals dependent on lp://staging/~rch-openerp/openobject-doc/doc_update_v6

lp://staging/~rch-openerp/openobject-doc/doc_update_v6 has no merge proposals.