Bad merge https://github.com/bikalabs/Bika-LIMS/commit/8a83ad8