Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx
Merge branch 'egfx' of github.com:awakecoding/FreeRDP into egfx