fork from openerp 20130706-231041