Merge pull request #949 from jkotas/warnings
authorJan Kotas <jkotas@microsoft.com>
Thu, 7 May 2015 18:55:33 +0000 (11:55 -0700)
committerJan Kotas <jkotas@microsoft.com>
Thu, 7 May 2015 18:55:33 +0000 (11:55 -0700)
Changes for building using VS2015


Trivial merge