Merge remote branch 'koha-fbc/k_bug_5203' into master