Upgrade stability on 4.2 branch.
This doesn't need to change.
Merge branch '4.2'