Merge pull request #3997 from lateralusX/jlorenss/win-api-family-support-safearray