merge fixes

This commit is contained in:
Volker Fischer 2020-06-05 22:43:14 +02:00
parent a9dc06f167
commit 81d000b773