# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1477866691 -3600
# Node ID f746f787f82cc24d99d00a8ee318b54fd0ab5481
# Parent  299cdaa24fa563ebf49c1e445e9a4ff122050f7b# Parent  c56b6210dd6cb41466db8cafb52b637bc204d7c0
merge with stable