The trunk needs to be synchronized with all the changes that have since
been made to the 1.2.2 branch.