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