JBEHAVE-886:  Applied patch from David Harrigan.