[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll