Patch for totrello -- regression introduced and not tested against