Merge pull request #1389 from blackberry/next

Next
Use Windows path separators in VC proj files
Merge pull request #1391 from blackberry/master

Merged master to next