Merge pull request #1 from apache/master
authorJoel Best <jbest@uoguelph.ca>
Wed, 23 Jan 2019 13:56:18 +0000 (08:56 -0500)
committerGitHub <noreply@github.com>
Wed, 23 Jan 2019 13:56:18 +0000 (08:56 -0500)
Sync with upstream


Trivial merge