Add fake tabs
Merge branch 'master' into nico