Merge pull request #2592 from hoyMS/Bug2311
authorHongtao Yu <hoy@microsoft.com>
Mon, 11 Jan 2016 23:16:59 +0000 (15:16 -0800)
committerHongtao Yu <hoy@microsoft.com>
Mon, 11 Jan 2016 23:16:59 +0000 (15:16 -0800)
Fix for issue 2311.


Trivial merge