Merge branch 'master' into test
authorMartin Kudlacek <kudlacek@unipi.technology>
Tue, 11 Feb 2020 15:41:11 +0000 (16:41 +0100)
committerMartin Kudlacek <kudlacek@unipi.technology>
Tue, 11 Feb 2020 15:41:11 +0000 (16:41 +0100)

Trivial merge