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