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