Mon, 23 Mar 2015 13:08:31 +0100Merge default tip
StephaneLenclud [Mon, 23 Mar 2015 13:08:31 +0100] rev 89
Merge