Wed, 13 Jun 2012 19:07:41 +0200 Edouard Tisserant Merged Francois BEAULIER's changes