bikalabs/Bika-LIMS#740 Bad merge