DEVELOPER-992, DEVELOPER-993
Merge pull request #542 from pmuir/DEVELOPER-992

DEVELOPER-992, DEVELOPER-993