Use the short link version for various things
Merge pull request #1180 from alex/short-link

Use the short link version for various things