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