4.2.0 code freeze

This is the code freeze candidate