DEVELOPER-657 & -> and
Merge pull request #305 from pmuir/DEVELOPER-657

DEVELOPER-657 & -> and