Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
files e9c5cacec8 disable by default 12 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu