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