Merged r990384 to the 1.5 branch.
1 file changed