Merge branch 'MDL-68793-master' of git://github.com/lameze/moodle