Merge branch 'Bug3482' of git://github.com/ptfs/Koha-PTFS into to-push