Merge pull request #1130 from apple/swift-PR-11088