Sync up.

4.2.0 code freeze