PLFM-3080
Merge pull request #1588 from brucehoff/release-65

PLFM-3080