Merge branch 'MDL-53357-dont-break-urls' of https://github.com/brendanheywood/moodle