Fix URL parsing/serializing
Merge branch 'master' of github.com:ubimix/mosaic-core