Merge branch 'MDL-59970-master' of git://github.com/damyon/moodle