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