Merge pull request #1375 from jkotas/vs2015-fixes
authorJan Kotas <jkotas@microsoft.com>
Tue, 11 Aug 2015 13:15:11 +0000 (06:15 -0700)
committerJan Kotas <jkotas@microsoft.com>
Tue, 11 Aug 2015 13:15:11 +0000 (06:15 -0700)
Assorted fixes for VS2015 build breaks


Trivial merge