Apply crf++ patch from David Judd