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

* origin/swift-3.1-branch:
  BranchFolder: Fix invalid undef flags after merge.