Merge branch 'master' into python3

Author: dxmaxwell

Test/test_scan_settings.py

@@ -145,10 +145,10 @@ def testSettingsBasedSet(self):
         setScanSettings(MyScanSettings())
 
         cmd = SettingsBasedSet('My:Motor1', 42)
-        self.assertEquals(str(cmd), "Set('My:Motor1', 42, completion=True, readback='My:Motor1.RBV', timeout=100)")
+        self.assertEquals(str(cmd), "Set('My:Motor1', 42, completion=True, timeout=100, readback='My:Motor1.RBV', tolerance=0.100000)")
 
         cmd = SettingsBasedSet('Unknown:Motor1', 42)
-        self.assertEquals(str(cmd), "Set('Unknown:Motor1', 42, readback='Unknown:Motor1.RBV')")
+        self.assertEquals(str(cmd), "Set('Unknown:Motor1', 42, readback='Unknown:Motor1.RBV', tolerance=0.100000)")
 
         cmd = SettingsBasedSet('Unknown:Motor1', 42, readback=False)
         self.assertEquals(str(cmd), "Set('Unknown:Motor1', 42)")
@@ -191,4 +191,4 @@ def testSettingsBasedWait(self):
 
 if __name__ == "__main__":
     unittest.main()
-    
+