Rebuild for Windows 7
Merge branch 'develop'