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