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