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