Tag build swift-DEVELOPMENT-SNAPSHOT-2017-01-16-a
Merge remote-tracking branch 'origin/swift-3.1-branch' into stable

* origin/swift-3.1-branch:
  Revert "Add -f[no-]strict-return flag that can be used to avoid undefined behaviour"
  Revert "Fix a buildbot failure introduced by r290960."