Merge remote-tracking branch 'translations/16.11.0-translate' into HEAD
authorKyle M Hall <kyle@bywatersolutions.com>
Tue, 22 Nov 2016 17:45:56 +0000 (17:45 +0000)
committerKyle M Hall <kyle@bywatersolutions.com>
Tue, 22 Nov 2016 17:47:36 +0000 (17:47 +0000)
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Trivial merge