Merge branch 'master' into tabs
Merge branch 'master' into tabs
Fix z-index in more places
Merge pull request #209 from scrollback/tabs

Fix z-index