fix bug in link_to getter
Merge updated remote-tracking branch 'upstream/links'