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