Fix delete of active tab
Merge branch 'master' into gh-pages