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

* origin/swift-3.1-branch:
  Use an artificial debug location for non-virtual thunks. Thunks are artificial and have no corresponding source location except for the line number on the DISubprogram, which is marked as artificial.