update to 4.2.0.r1

4.2.0 has not yet been released but we need some bits of it.