Merge remote-tracking branch 'bernardo/16.11.16-translate-20180222' into 16.11.x
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 22 Feb 2018 19:40:39 +0000 (08:40 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 22 Feb 2018 19:40:39 +0000 (08:40 +1300)

Trivial merge