Merge branch 'feature-autolink' into closeio