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