Merge "Switch custom code to wfParseUrl which covers the same bugfix"