Merge remote-tracking branch 'bernardo/16.11.15-translate-20180103' into 16.11.x
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 3 Jan 2018 19:21:37 +0000 (08:21 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 3 Jan 2018 19:21:37 +0000 (08:21 +1300)

Trivial merge