Merge branch 'MDL-33476' of git://github.com/esqueeze/moodle