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