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