Merge branch 'MDL-51704-master' of git://github.com/dpalou/moodle