Merge branch 'bug4036' of git://git.librarypolice.com/git/koha-galen into to-push