Merge pull request #7919 from codyopel/gyp
gyp: svn-1977 -> 2015-05-17
William A. Kennington III 10 years ago efd4fcbe 904fa36a