Blind fix for #1846
Merge branch 'staging' into gh-1846
Fixed call to universal_url()
Merge pull request #1864 from pculture/gh-1846

Gh 1846