freerdp: merging with master