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