Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Thu, 1 Feb 2018 20:54:01 +0000 (15:54 -0500)
committerEquinox <info@esilibrary.com>
Thu, 1 Feb 2018 20:54:01 +0000 (15:54 -0500)

Trivial merge