Merge pull request #159 from odoo-dev/master-gengo-fix-rim