rename update -> link
Merge branch 'master' into windows