Merge branch 'MDL-29904-master' of git://github.com/lazydaisy/moodle