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