Merge pull request #1723 from madewokherd/winvista