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