Show diff
Update vi
Merge branch 'master' into hpu