# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1555572656 0
# Node ID 37e396ae08a343b7a0fb2a89ec4c0ed4ca549ba8
# Parent  aaeec7be8fb7865f21e5e13be2c696bb7a1660e8# Parent  1201b12eb9f85d6b576625f5bacee9282b0b6c95
Merged dev into default