Merge branch 'MakhnuB/koha-manual-manual18.05.x' into HEAD