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