Merge branch 'wip-MDL-33162-master' of git://github.com/barbararamiro/moodle