Merge branch 'MDL-36856' of git://github.com/kastashov/moodle