Merge pull request #813 from theoractice/develop
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 22 Mar 2016 15:31:37 +0000 (11:31 -0400)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 22 Mar 2016 15:31:37 +0000 (11:31 -0400)
Fix access violation on Windows while static linking in MSVC


Trivial merge