tree cf33758b46946096e34c348cde031bb36cab4789
parent e60137e5ad23a68176840411e304608fb43a7627
parent fe5fe00a4944e2985b9f524626cd91ebeb3a00a6
author swift-ci <swift-ci@users.noreply.github.com> 1525992975 -0700
committer swift-ci <swift-ci@users.noreply.github.com> 1525992975 -0700

Merge remote-tracking branch 'origin/swift-4.2-branch' into stable