DEVELOPER-976
Merge pull request #530 from pmuir/DEVELOPER-976

Developer 976