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