Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Wed, 20 Sep 2017 14:45:03 +0000 (10:45 -0400)
committerEquinox <info@esilibrary.com>
Wed, 20 Sep 2017 14:45:03 +0000 (10:45 -0400)

Trivial merge