Merge pull request #1203 from johnno1962e/swift-4.0-branch