Merge branch 'master' into eg33
authorJeff Davis <jdavis@sitka.bclibraries.ca>
Thu, 11 Jul 2019 22:42:30 +0000 (15:42 -0700)
committerJeff Davis <jdavis@sitka.bclibraries.ca>
Thu, 11 Jul 2019 22:42:30 +0000 (15:42 -0700)

Trivial merge