Merge branch 'MDL-55993-master' of https://github.com/albertolarah/moodle