Merge branch 'MDL-35870' of git://github.com/nobelium/moodle