Merge branch 'MDL_55423_master' of https://github.com/alexandru-elisei/moodle