Merge pull request #3920 from love-ginger/master
authorWouter van Oortmerssen <wvo@google.com>
Fri, 1 Jul 2016 16:48:09 +0000 (09:48 -0700)
committerGitHub <noreply@github.com>
Fri, 1 Jul 2016 16:48:09 +0000 (09:48 -0700)
Fix mac build error


Trivial merge