Merge pull request #3470 from untoldone/master
authorakallabeth <akallabeth@users.noreply.github.com>
Tue, 11 Oct 2016 11:15:13 +0000 (13:15 +0200)
committerGitHub <noreply@github.com>
Tue, 11 Oct 2016 11:15:13 +0000 (13:15 +0200)
mac BUILD_SHARED_LIBS=ON fix (on master)


Trivial merge