Fix merge conflicts with master

Author: dhoomakethu

test/test_client_sync.py

@@ -156,6 +156,8 @@ def testUdpClientRepr(self):
             client.host, client.port, client.timeout
         )
         self.assertEqual(repr(client), rep)
+
+
     # -----------------------------------------------------------------------#
     # Test TCP Client
     # -----------------------------------------------------------------------#
@@ -234,7 +236,6 @@ def testSerialClientRpr(self):
             client.host, client.port, client.timeout
         )
         self.assertEqual(repr(client), rep)
-
     # -----------------------------------------------------------------------#
     # Test Serial Client
     # -----------------------------------------------------------------------#