Document automatic linking from keywords
Merge remote-tracking branch 'upstream/master'