Merge branch '18.05.x' of git://git.koha-community.org/koha into rmain1805
authorLucas Gass <lucasgass@Lucass-MacBook-Pro.local>
Fri, 14 Dec 2018 17:51:41 +0000 (10:51 -0700)
committerLucas Gass <lucasgass@Lucass-MacBook-Pro.local>
Fri, 14 Dec 2018 17:51:41 +0000 (10:51 -0700)

Trivial merge