Fri, 15 Jun 2012 18:28:57 +0200 Edouard Tisserant merge