Changed to support JDG 6.3
Merge pull request #277 from vhalbert/8.7.x

Changed to support JDG 6.3