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