Handle URL= case in windows-generated weblinks
Merge remote-tracking branch 'origin/develop' into develop