# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1585512762 -7200
# Node ID 06307833684b68b4b9b336c3087ec68409be569e
# Parent  48edd69814d5ef8b2201714e381bc0478d83ebc8# Parent  6b63ba5b078a1013eb4a51a3ede8a48d9cff39fa
Merge 0.11->trunk