Merge branch 'master' into publishing

This commit is contained in:
Set Hallstrom 2019-02-28 17:25:24 +01:00
commit 6d77bc9fad