# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1493812712 -7200
# Node ID 3c7c4d92022fee0a7b2855d84d73cbc78c65d1b6
# Parent  b9ce138eca63670aef0ccdc8048a457f4251bc14# Parent  673de955b14d70537bb73412d5eb72c181aaadd3
merge back with stable