for non-http urls, just return the plain url instead of dying.
Merge branch 'master' into RELEASE_20140325