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