Merge branch 'advanced-win7-taskbar-grouping'