Merge branch 'master' into threading

Conflicts:
	RELEASE_NOTES

1 files changed, 14 insertions, 0 deletions

diff --git a/testdata/scad/features/sub1/sub2/sub3/sub4/use-test2.scad b/testdata/scad/features/sub1/sub2/sub3/sub4/use-test2.scad
new file mode 100644
index 0000000..68013db
--- /dev/null
+++ b/testdata/scad/features/sub1/sub2/sub3/sub4/use-test2.scad
@@ -0,0 +1,14 @@
+//Test nested use
+use <use-test3.scad>
+
+//Test relative file location
+use <../use-test4.scad>
+
+test2_variable = 0.7;
+
+module test2()
+{
+  translate([2,0,0]) test3();
+  translate([2,-2,0]) test4();
+  cube(center=true);
+}