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

Trivial merge