Merge branch 'w18_MDL-32589_m23_proxytest' of git://github.com/skodak/moodle