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