Merge remote-tracking branch 'gitlab/manual17.11.x' into manual17.11.x
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 28 Dec 2017 21:37:52 +0000 (10:37 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 28 Dec 2017 21:37:52 +0000 (10:37 +1300)

Trivial merge