# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1519121809 -3600
# Node ID 8f3c2017b0e33cf8341c8d1887054fbfe8253a8f
# Parent  8437607835ef62fa2fef0ea5792307aa385ca5a8# Parent  813ab664f7feeb788dd721f8fd33a8bab3fb8090
merge