Merge remote-tracking branch 'origin/master' into merge-master

testing/example_scripts/fixtures/fill_fixtures/test_detect_recursive_dependency_error.py

@@ -0,0 +1,15 @@
+import pytest
+
+
+@pytest.fixture
+def fix1(fix2):
+    return 1
+
+
+@pytest.fixture
+def fix2(fix1):
+    return 1
+
+
+def test(fix1):
+    pass