Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Wed, 7 Dec 2016 17:57:01 +0000 (12:57 -0500)
committerEquinox <info@esilibrary.com>
Wed, 7 Dec 2016 17:57:01 +0000 (12:57 -0500)

Trivial merge