Add latest changes (cherry picked from 3.1dev)

including the one since 3.0
This commit is contained in:
Dirk Wetter
2020-04-28 14:59:35 +02:00
committed by Dirk
parent db84e5c87c
commit 3745e12673

Diff Content Not Available