Merge remote branch 'kc/new/bug_5804' into kcmaster
[koha.git] / --