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