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