Fixed issue #625 for VS 2012 and 2013.
Merge pull request #627 from blackberry/next-625

Fixed issue #625 for VS 2012 and 2013.