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