Merged r4724 (1.3.0 release changes) back into trunk.