Fixed issue #430 for VS2012 and 2013
Fixed issue #131 for VS2012 and 2013
Merge pull request #558 from blackberry/next-131

Next 131