PLFM-2539
Merge pull request #1059 from brucehoff/release-30

PLFM-2539