# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1544720307 -3600
# Node ID b9f0b0c0b36f6e60986623b2d8afc7a94bc814c2
# Parent  8812b1e27f247c0dcd50adb8f70843de976eae21# Parent  8a15bb3576c2f9d2898659f55a21e0efd36e6d3e
merge