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

* origin/swift-3.1-branch:
  Module: for ObjectiveC, be consistent when checking hidden decls.