Update from the sagesaleslogix fork.