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