Merge branch 'win7-taskbar'