Squareifeid the tabs.
Merge branch 'patrickbranch'