Merge branch 'hl' of github.com:HaxeFoundation/haxe into hl

tests/unit/src/unit/Test.hx

@@ -252,7 +252,7 @@ class Test {
 	}
 
 	static function resetTimer() {
-		#if (neko || php || cpp || java || cs || python)
+		#if (neko || php || cpp || java || cs || python || hl)
 		#else
 		if( timer != null ) timer.stop();
 		timer = new haxe.Timer(30000);

tests/unit/src/unit/issues/Issue4695.hx

@@ -5,16 +5,16 @@ class Issue4695 extends unit.Test {
 	function eqCheck<T>(v1:T, v2:T) {
 		return v1 == v2;
 	}
-	
+
 	public function testNull() {
 		f("" == null);
 		f(eqCheck("", null));
-		#if !(cpp || flash9 || as3 || java || cs)
+		#if !(cpp || flash9 || as3 || java || cs || hl)
 		f(false == null);
 		f(eqCheck(false, null));
 		#end
 	}
-	
+
 	#if php
 	public function testNativeArray() {
 		var a1 = (untyped __php__)('array("f1" => 1, "f2" => 2, "f3" => 3)');
@@ -23,5 +23,5 @@ class Issue4695 extends unit.Test {
 		f(eqCheck(a1, a2));
 	}
 	#end
-	
+
 }