removing url shortener
Merged from master