Merge pull request #588 from john-hill/PLFM-2079

fix for PLFM-2079
Merge branch 'release-6' into develop