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