fixed shortlinks
Merge branch 'shortlinks' into featuremerge2