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