Sun, 17 Jun 2012 12:37:52 +0200 Laurent Bessard merge