AXIOM-494: Merge r1850810 to the 1.2 branch.
1 file changed