VE update. Fix sync issues
Merge branch 'ssupgrade' of https://github.com/ging/vish into ssupgrade