Merge branch 'rel_3_0' of git.evergreen-ils.org:Evergreen into rel_3_0
authorJane Sandberg <sandbej@linnbenton.edu>
Fri, 17 Nov 2017 04:30:45 +0000 (20:30 -0800)
committerJane Sandberg <sandbej@linnbenton.edu>
Fri, 17 Nov 2017 04:30:45 +0000 (20:30 -0800)

Trivial merge