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