Merge pull request #3057 from ShabbyX/fix-gn-build