Authenticated short urls.
Merged local changes.