Merge pull request #1282 from awakecoding/master

Misc. Fixes
Interim fix for hiding cmd-line passwords
Merge remote-tracking branch 'remotes/blackbird-freerdp/cmdline-password' into CaramorSimonMaster