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

* origin/swift-3.1-branch:
  [modules] Apply ODR merging for function scoped tags only in C++ mode.