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

* origin/swift-3.1-branch:
  [APINotes] Add a 'SwiftImportAsAccessors' entry for properties. (#40)