# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1555578343 0
# Node ID 375dc0aeb19b7c0ee84a79b49af59568090cdd00
# Parent  37e396ae08a343b7a0fb2a89ec4c0ed4ca549ba8# Parent  ccd1a1ede305baaf2388960403319425909eefe1
Merged am-dev into default