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