# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1492686345 -7200
# Node ID 080b9384d7419f98943de377084e5abc33e0bcad
# Parent  dad84c052463e5cf57d8a74655c9ee514e76be7b# Parent  1b6d4d176145d043bc953d6644e15ab2b640531e
merge back with stable