Merge branch 'master' of git.evergreen-ils.org:Evergreen into user/berick/lp1452950...
authorBill Erickson <berickxx@gmail.com>
Sat, 16 Jan 2016 15:53:24 +0000 (10:53 -0500)
committerBill Erickson <berickxx@gmail.com>
Sat, 16 Jan 2016 15:53:24 +0000 (10:53 -0500)

Trivial merge