Merge branch 'MDL-36950-updates-proxy' of git://github.com/mudrd8mz/moodle