This closes #2542
authorJustin Bertram <jbertram@apache.org>
Thu, 7 Feb 2019 21:20:04 +0000 (15:20 -0600)
committerJustin Bertram <jbertram@apache.org>
Thu, 7 Feb 2019 21:20:04 +0000 (15:20 -0600)

Trivial merge