Merge pull request #15 from jonludlam/CA-82314

CA-82314