3713 Implement accept4() (fix lint)
Merge branch 'upstream'