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