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