Merge branch 'MDL-32309-master' of git://github.com/FMCorz/moodle