Merge pull request #3626 from lateralusX/jlorenss/win-api-family-support-eglib