Merge branch 'master' into release

This commit is contained in:
Lubos Petrovic
2020-12-02 08:47:57 +01:00
33 changed files with 4090 additions and 1663 deletions