Merge branch 'w02_MDL-37483_m25_redirect' of git://github.com/skodak/moodle