bzr revid: fme@openerp.com-20140505145816-jz7e4byh1imrkaek
bzr revid: fme@openerp.com-20140327105023-x3r7mjmptjxpzkqc
Test suite is still todo bzr revid: fme@openerp.com-20140326151411-moo1yuozvpgro1mh