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

* origin/swift-3.1-branch:
  Re-apply "ObjectiveC Generics: Start using ObjCTypeParamType." (#48)