merge 471216 471192 thanks Bastian, please check the BTS before submitting bugs. Thanks. -- Ludovic Brenta.