Merge branch 'master' of git.evergreen-ils.org:Evergreen
authorJane Sandberg <sandbej@linnbenton.edu>
Tue, 10 Apr 2018 23:30:54 +0000 (16:30 -0700)
committerJane Sandberg <sandbej@linnbenton.edu>
Tue, 10 Apr 2018 23:30:54 +0000 (16:30 -0700)

Trivial merge