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