Merge branch 'linkify' into 'develop'