Merge remote-tracking branch 'origin/master' into master-next

Author: gottesmm

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,47 +1,13 @@
-<!-- Please complete this template before creating the pull request. -->
-#### What's in this pull request?
-<!-- Description about pull request. -->
+<!-- What's in this pull request? -->
+Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.
 
-#### Resolved bug number: ([SR-](https://bugs.swift.org/browse/SR-))
-<!-- If this pull request resolves any bugs from Swift bug tracker -->
+<!-- If this pull request resolves any bugs in the Swift bug tracker, provide a link: -->
+Resolves [SR-NNNN](https://bugs.swift.org/browse/SR-NNNN).
 
-* * * *
+<!--
+Before merging this pull request, you must run the Swift continuous integration tests.
+For information about triggering CI builds via @swift-ci, see:
+https://github.com/apple/swift/blob/master/docs/ContinuousIntegration.md#swift-ci
 
-<!-- This selection should only be completed by Swift admin -->
-Before merging this pull request to apple/swift repository:
-- [ ] Test pull request on Swift continuous integration.
-
-<details>
-  <summary>Triggering Swift CI</summary>
-
-The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:
-
-**Smoke Testing**
-
-        Platform     | Comment
-        ------------ | -------------
-        All supported platforms     | @swift-ci Please smoke test
-        All supported platforms     | @swift-ci Please smoke test and merge
-        OS X platform               | @swift-ci Please smoke test OS X platform
-        Linux platform              | @swift-ci Please smoke test Linux platform
-
-**Validation Testing**
-
-        Platform     | Comment
-        ------------ | -------------
-        All supported platforms     | @swift-ci Please test
-        All supported platforms     | @swift-ci Please test and merge
-        OS X platform               | @swift-ci Please test OS X platform
-        OS X platform               | @swift-ci Please benchmark
-        Linux platform              | @swift-ci Please test Linux platform
-
-
-**Lint Testing**
-
-        Language     | Comment
-        ------------ | -------------
-        Python       | @swift-ci Please Python lint
-
-Note: Only members of the Apple organization can trigger swift-ci.
-</details>
-<!-- Thank you for your contribution to Swift! -->
+Thank you for your contribution to Swift!
+-->