Merged r3934 from trunk.
Merged r3933 from trunk.
Merged r3932 from trunk.
Merged r3931 from trunk.
Merged r3930 from trunk.
Merged r3929 from trunk.
Merged r3928 from trunk.
Merged r3927 from trunk.
Merged r3926 from trunk.
Merged r3925 from trunk.