Merge branch 'MDL-30911' of git://github.com/rwijaya/moodle