Merge branch 'MDL-24951-master' of git://github.com/Chocolate-lightning/moodle