Merge branch 'master' into docker_tests
authorgggeek <giunta.gaetano@gmail.com>
Fri, 11 Dec 2020 12:26:51 +0000 (12:26 +0000)
committergggeek <giunta.gaetano@gmail.com>
Fri, 11 Dec 2020 12:26:51 +0000 (12:26 +0000)

Trivial merge