Merge branch 'xenial'
authorJeff Davis <jdavis@sitka.bclibraries.ca>
Wed, 24 Oct 2018 23:31:20 +0000 (16:31 -0700)
committerJeff Davis <jdavis@sitka.bclibraries.ca>
Wed, 24 Oct 2018 23:31:20 +0000 (16:31 -0700)

Trivial merge