This closes #2544
authorJustin Bertram <jbertram@apache.org>
Thu, 7 Feb 2019 20:19:19 +0000 (14:19 -0600)
committerJustin Bertram <jbertram@apache.org>
Thu, 7 Feb 2019 20:19:19 +0000 (14:19 -0600)

Trivial merge