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