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