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

* origin/swift-3.1-branch:
  [API Notes] Remove comment for nonexistent parameter 'swiftVersion'. NFC