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