DEVELOPER-965
Merge pull request #509 from pmuir/DEVELOPER-965

DEVELOPER-965