Merge branch 'w13_MDL-26966_21_urlparsing' of git://github.com/skodak/moodle