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