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