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