Fixed issues #635 and #453 for VS 2012 and 2013.
Merge pull request #636 from blackberry/next-635

Fixed issues #635 and #453 for VS 2012 and 2013.