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