Trac #12555: review patch
Merge branch 't12555' into Zq
Merge branch 'Zq' of github.com:saraedum/sage into Zq