Wed, 04 Feb 2015 21:53:06 +0100Merge
StephaneLenclud [Wed, 04 Feb 2015 21:53:06 +0100] rev 26
Merge