Better tab index handling
Merge branch 'master' into ST3