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