Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	cluster/test/test_hierarchical.py
	pytest.ini

Author: exhuma

cluster/test/test_hierarchical.py

@@ -65,13 +65,6 @@ def testClusterLen0(self):
 
 class HClusterIntegerTestCase(Py23TestCase):
 
-    def __init__(self, *args, **kwargs):
-        super(HClusterIntegerTestCase, self).__init__(*args, **kwargs)
-        if hexversion < 0x030000f0:
-            self.assertCItemsEqual = self.assertItemsEqual
-        else:
-            self.assertCItemsEqual = self.assertCountEqual
-
     def setUp(self):
         self.__data = [791, 956, 676, 124, 564, 84, 24, 365, 594, 940, 398,
                        971, 131, 365, 542, 336, 518, 835, 134, 391]

pytest.ini

@@ -1,2 +1,3 @@
 [pytest]
+looponfailroots = cluster
 norecursedirs = env env3 env3_nonumpy .git