Merge commit 'dd6d82955087e1b53c8d9f1a7a5b252c8a545210^' into httpproxy

diff --cc client/common/cmdline.c
Simple merge

diff --cc include/freerdp/settings.h
Simple merge

diff --cc libfreerdp/common/settings.c
Simple merge

diff --cc libfreerdp/core/CMakeLists.txt
Simple merge

diff --cc libfreerdp/core/settings.c
Simple merge

diff --cc libfreerdp/core/tcp.c
Simple merge

diff --cc libfreerdp/core/transport.c
Simple merge