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