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