tree 25968b2eeec2e41bd8429f27e4caf80e378d7a9a
parent 781c668f4ea89fc723e76d6740713eb754bb6e7b
parent f8a30b973ba067b26af78a5b92dd9fe25f6b9df2
author swift-ci <swift-ci@users.noreply.github.com> 1484560217 -0800
committer swift-ci <swift-ci@users.noreply.github.com> 1484560217 -0800

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."