libwinpr-environment: fix usage of environ on OS X
Merge branch 'master' of github.com:awakecoding/FreeRDP