Merge branch 'master' of git://github.com/awakecoding/FreeRDP
Merge branch 'master' of https://github.com/mrthebunny/FreeRDP

# Via Benoit LeBlanc
* 'master' of https://github.com/mrthebunny/FreeRDP: