gustafn
committed
on 15 Nov 19
apply patch from mischa to current development pranch