Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Fri, 15 Sep 2017 00:36:02 +0000 (20:36 -0400)
committerEquinox <info@esilibrary.com>
Fri, 15 Sep 2017 00:36:02 +0000 (20:36 -0400)

Trivial merge