Issue with link generation fixed.
Merge remote-tracking branch 'qafoo/master' into HEAD