Merge branch 'MDL-68200-master-take2' of git://github.com/rezaies/moodle