Merge the update from burkeholland/master

Update from burkeholland/master: Tab position after bolding and use selection for link text