This closes #2539
authorClebert Suconic <clebertsuconic@apache.org>
Thu, 7 Feb 2019 15:04:52 +0000 (10:04 -0500)
committerClebert Suconic <clebertsuconic@apache.org>
Thu, 7 Feb 2019 15:04:52 +0000 (10:04 -0500)

Trivial merge