Tag build swift-DEVELOPMENT-SNAPSHOT-2016-10-18-a
Merge remote-tracking branch 'origin/swift-3.1-branch' into stable

* origin/swift-3.1-branch:
  add-discriminators: Fix handling of inlined locations