# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1541408793 -3600
# Node ID 20a20babc02c4fb989a92f80e073c1e36ea24d78
# Parent  17d1814c2fd49bfe143fc19c955a85a40b5199cc# Parent  d6136a7e914d04ab2765c764f6a8d93ac97f2529
merge