Merge branch 'master' of /usr/local/git/koha_base.git/