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