DEVELOPER-960
Merge pull request #55 from pmuir/DEVELOPER-960

DEVELOPER-960