2007-11-07 Matthias Clasen === Branch for 2.14 ===