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