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