Merge branch 'master' of git.evergreen-ils.org:Evergreen into collab/berick/lp1468422...
authorBill Erickson <berickxx@gmail.com>
Fri, 8 Jan 2016 16:11:40 +0000 (11:11 -0500)
committerBill Erickson <berickxx@gmail.com>
Fri, 8 Jan 2016 16:11:40 +0000 (11:11 -0500)

Trivial merge