Fixed our url changes not playing well with data: urls.
Merge branch 'dev'