# HG changeset patch
# User Tuomo Valkonen <tuomov@iki.fi>
# Date 1778874390 18000
# Node ID 3868555d135cbfcb43c467bffbcc374dd6406cd2
# Parent  1f19c6bbf07b1305db75b5fef0a129bad63ac67e# Parent  1f301affeae303baa66c845705432863143b21e5
Merge dev into default