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