Merge branch 'MDL-26524' of git://github.com/grabs/moodle