This closes #2540
authorClebert Suconic <clebertsuconic@apache.org>
Wed, 6 Feb 2019 23:32:30 +0000 (18:32 -0500)
committerClebert Suconic <clebertsuconic@apache.org>
Wed, 6 Feb 2019 23:32:30 +0000 (18:32 -0500)

Trivial merge