Merge branch 'master' of git://git.koha-community.org/koha