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