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

diff --cc libfreerdp/core/capabilities.c
index 588434b,7f8b356..85c6b8b
--- 1/libfreerdp/core/capabilities.c
--- 2/libfreerdp/core/capabilities.c
+++ b/libfreerdp/core/capabilities.c
@@@ -3417,19 -3480,10 +3483,19 @@@ BOOL rdp_read_capability_sets(wStream* 
  
        if (numberCapabilities)
        {
-               fprintf(stderr, "%s: strange we haven't read the number of announced capacity sets, read=%d expected=%d\n",
-                               __FUNCTION__, count-numberCapabilities, count);
+               WLog_ERR(TAG,  "strange we haven't read the number of announced capacity sets, read=%d expected=%d",
+                                count-numberCapabilities, count);
        }
  
 +      /**
 +       * If we never received a multifragment update capability set,
 +       * then the peer doesn't support fragmentation.
 +       */
 +      if (!foundMultifragmentUpdate)
 +      {
 +              settings->MultifragMaxRequestSize = 0;
 +      }
 +
  #ifdef WITH_DEBUG_CAPABILITIES
        Stream_GetPointer(s, em);
        Stream_SetPointer(s, mark);

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

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

diff --cc libfreerdp/core/rdp.h
Simple merge