Merged r1598985 to the 1.6 branch for compatibility with future Axiom versions.
1 file changed