Merge pull request #8347 from Rastaban/master
authorKevin Sawicki <kevin@github.com>
Thu, 5 Jan 2017 22:53:11 +0000 (14:53 -0800)
committerGitHub <noreply@github.com>
Thu, 5 Jan 2017 22:53:11 +0000 (14:53 -0800)
fix permissive C++ code (MSVC /permissive-)


Trivial merge