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