Workaround on some URL constructions
Merge pull request #393 from emmanuel-keller/1.5

Workaround on some URL constructions