8.0 'base' (onesteinbv)

Port 'base' modification realized by OneStein BV. (branch onesteinbv:8.0-os)


Sorry this needs to be reviewed. This was a workaround and might no longer be required with the merge of Odoo 8.0 (8ba452fc19382eb292bf1761e084ba2145e01b03)