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