# HG changeset patch
# User Alain Mazy <alain@mazy.be>
# Date 1557990674 -7200
# Node ID 3f13f7f1b55d5ba71dd5ef92e321e99b4c06f952
# Parent  9e3bb8b4f72662489a369fe9ce4abb94741e6c01# Parent  86930bc676c6f5640835526f6b1815206670efda
merge default -> am-dev