PR: 26262 Submitted by: John Merryweather Cooper <jmcoopr@webmail.bmi.net>
PR: 17799 Submitted by: Samuel Tardieu <sam@inf.enst.fr>