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