Merge branch 'master' into 3.2.1-changes

Conflicts:
	extra/CHANGES.txt
	gencpp.ml
	main.ml
	std/js/Lib.hx
	tests/unit/src/unit/issues/Issue3388.hx
	tests/unit/src/unit/issues/Issue4407.hx
	tests/unit/src/unit/issues/Issue4457.hx

extra/CHANGES.txt

@@ -51,6 +51,18 @@
 	macro : added overloads field to ClassField (#3460)
 	macro : added Context.getLocalImports (#3560)
 
+2015-10-11: 3.2.1
+
+	Bugfixes:
+
+	cs/java : fixed `-dce no` issues
+	cs/java : fixed how KExpr type parameters are generated
+	cs : fixed enum creation by reflection problem
+	cpp : do not rely in reflection to make interfaces work for non-first interface parents
+	cpp : fixed setting of static variables via reflection when class has no member variables
+	cpp : make sure StringMap's h field is kept if we use StringMap
+	js : Avoid the use of `eval`/`Function` to get the top-level defined type/var to not break ContentSecurityPolicy
+
 2015-05-12: 3.2.0
 
 	New features: