DEVELOPER-895
Merge pull request #446 from pmuir/DEVELOPER-895

DEVELOPER-895