skip links from stories to themselves
Merge branch 'master' into RELEASE_20140325