Apply fix from upstream pull #686 for ZCAGCD-349
Merge pull request #3 from twotoasters/carlton-dev

Apply fix from upstream pull #686 for ZCAGCD-349