Merge remote-tracking branch 'kc/16.11.x' into 16.11.x
authorChris Cormack <chrisc@catalyst.net.nz>
Sat, 13 Jan 2018 00:24:18 +0000 (13:24 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sat, 13 Jan 2018 00:24:18 +0000 (13:24 +1300)

Trivial merge