# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1484773583 -3600
# Node ID b61e849fe4517459c0a6ee937f3e4467555d2824
# Parent  3cc9f17ca9bb5f2eff4a13cb47293dd56a8e6156# Parent  7f60766aae160245b89f750b15d560243bacb274
merge branch changes into default