Rewrite of core/url.  Causes getCurrentUrl to return a URL that's built from the site's base_url parameter rather than server variables (which may not yield the results we're expecting on Nginx).
Merge remote-tracking branch 'origin/master'