Merge branch 'MDL-40499' of git://github.com/jmvedrine/moodle