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