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

* origin/swift-3.1-branch:
  Debug info: Bump the default DWARF version on Darwin to 4.