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