tree e92a7eb4b741dc33cbf02c6aefa9fdb983b6e867
parent 8d35d7d54c57d85a7dea6cbd54dfcfbd00901478
parent cc316bc953bf1b68ccfa9eeb58eecc6a749c13bd
author swift-ci <swift-ci@users.noreply.github.com> 1495588886 -0700
committer swift-ci <swift-ci@users.noreply.github.com> 1495588886 -0700

Merge remote-tracking branch 'origin/swift-4.0-branch' into stable