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