Merge branch 'master' into release-2019.11

This commit is contained in:
Magne Sjaastad 2019-12-19 08:00:41 +01:00
commit 682c1324b7
2 changed files with 157 additions and 157 deletions