# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1558438074 -7200
# Node ID 529189f399ece073e6b3e310d70ac411e31eb201
# Parent  853e30d17caef73333b827e604454ccfb110e64e# Parent  8190213e2279eac51cb598250fd15875e9aa73c6
Merged am-dev into default