[FIX]
Merge branch 'master' of github.com:ingadhoc/odoo-addons