Merge branch 'mllaflamme/koha-manual-patch-5'