Merge remote-tracking branch 'gitlab/master'
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 10 Oct 2018 21:59:47 +0000 (10:59 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 10 Oct 2018 21:59:47 +0000 (10:59 +1300)

Trivial merge