Merge branch 'koha_gimpoz' of /srv/koha/ into koha_gimpoz