Merging the postbeta2 branch onto the mainline.