Merge branch 'w43_MDL-30005_m22_uri' of git://github.com/skodak/moodle