This closes #2537
authorClebert Suconic <clebertsuconic@apache.org>
Wed, 6 Feb 2019 14:36:04 +0000 (09:36 -0500)
committerClebert Suconic <clebertsuconic@apache.org>
Wed, 6 Feb 2019 14:36:04 +0000 (09:36 -0500)

Trivial merge