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