Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Fri, 18 Aug 2017 16:45:02 +0000 (12:45 -0400)
committerEquinox <info@esilibrary.com>
Fri, 18 Aug 2017 16:45:02 +0000 (12:45 -0400)

Trivial merge