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

Next 432