Merge branch 'bug2505_patches' of git://git.catalyst.net.nz/koha into to-push