Merge 3.3 into default.

The only file change is adding the v3.2.5 tag to the .hgtags file.