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