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