Prepare release
Closes #1468
Merge branch '4.2' into 4.3