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