Mon, 04 Apr 2011 13:25:39 +0200 Edouard Tisserant Merge with changes from Mario