DEVELOPER-674
Merge pull request #282 from pmuir/DEVELOPER-674

DEVELOPER-674