Merge branch 'wip-MDL-33795-master' of https://github.com/barbararamiro/moodle