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

Trivial merge