Merge branch 'win7-library'