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