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