gui repair
Merge branch 'master' into gui
Update index