Merge branch 'igloo2'
authorClifford Wolf <clifford@clifford.at>
Wed, 31 Oct 2018 14:37:39 +0000 (15:37 +0100)
committerClifford Wolf <clifford@clifford.at>
Wed, 31 Oct 2018 14:37:39 +0000 (15:37 +0100)

Trivial merge