Merge remote-tracking branch 'michael-k/links'