Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Fri, 21 Sep 2018 15:30:01 +0000 (11:30 -0400)
committerEquinox <info@esilibrary.com>
Fri, 21 Sep 2018 15:30:01 +0000 (11:30 -0400)

Trivial merge