Tue, 26 May 2015 12:25:34 +0200Merge
StephaneLenclud [Tue, 26 May 2015 12:25:34 +0200] rev 139
Merge