tree 2f8d71112d094d106484acac38a102f800fe6d16
parent 9cee8173868e38db2c01a195461fe988cb554fa2
parent 6edc24a5b412f587ff5018b62eb7aae8a79f7a1e
author Brian Croom <Brian.s.croom@gmail.com> 1471387799 -0700
committer GitHub <noreply@github.com> 1471387799 -0700

Merge pull request #157 from mike-ferris-apple/swift-3.0-branch

Cherry-picked fix for SR-2332 from master into swift-3.0-branch.