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