Merge "Mark sockets on accept()."