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