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