Merge branch 'master' into test
authorMartin Kudlacek <kudlacek@unipi.technology>
Mon, 4 Jan 2021 15:36:44 +0000 (16:36 +0100)
committerMartin Kudlacek <kudlacek@unipi.technology>
Mon, 4 Jan 2021 15:36:44 +0000 (16:36 +0100)

Trivial merge