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