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

Next 219