Merge branch 'MDL-36331_redirect' of git://github.com/andyjdavis/moodle