Fixed issue #568 for VS2013 and 2012
Merge pull request #591 from blackberry/next-568

Next 568