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