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