Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Fri, 4 Jan 2019 19:09:01 +0000 (14:09 -0500)
committerEquinox <info@esilibrary.com>
Fri, 4 Jan 2019 19:09:01 +0000 (14:09 -0500)

Trivial merge