Merge pull request #2552 from hoyMS/Bug2298
authorHongtao Yu <hoy@microsoft.com>
Thu, 7 Jan 2016 22:15:44 +0000 (14:15 -0800)
committerHongtao Yu <hoy@microsoft.com>
Thu, 7 Jan 2016 22:15:44 +0000 (14:15 -0800)
Fix for Bug 2298


Trivial merge