Merge branch 'trivial_bugs' of git://git.koha-community.org/wip/koha-fbc into kcmaster