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