Merge pull request #2030 from jkotas/vs2015-update1-buildbreak
authorJan Kotas <jkotas@microsoft.com>
Fri, 13 Nov 2015 01:03:56 +0000 (17:03 -0800)
committerJan Kotas <jkotas@microsoft.com>
Fri, 13 Nov 2015 01:03:56 +0000 (17:03 -0800)
Fix build break on VS2015 Update 1


Trivial merge