Merge pull request #4274 from Zweihorn/align-url-001