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