Merge branch 'MDL-62344-master-final' of https://github.com/Tsheke/moodle