Merge pull request #7218 from matijaskala/patch-4
authorAlan Jenkins <alan.christopher.jenkins@gmail.com>
Mon, 30 Oct 2017 17:42:33 +0000 (17:42 +0000)
committerGitHub <noreply@github.com>
Mon, 30 Oct 2017 17:42:33 +0000 (17:42 +0000)
fix compile errors on musl


Trivial merge