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