Merge pull request #20 from ggear/graham-patch-CDH-11869

Graham patch for CDH-11869