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