Merge branch 'MDL-44468_master' of git://github.com/ds125v/moodle