Merge branch 'MDL-30343' of git://github.com/scriby/moodle