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

* origin/swift-3.1-branch:
  TargetMachine: Make the win32-macho workaround more specific.