Original fails
Merge https://github.com/Sk1f161/OpenERP