Merge branch 'dev' into locm3

* this also brings all changes from 4.0_beta

Makefile

@@ -243,7 +243,6 @@ clean:
 	$(Q)make -C sw/ext clean
 	$(Q)find . -name '*~' -exec rm -f {} \;
 	$(Q)rm -f paparazzi sw/simulator/launchsitl
-	$(Q)rm -rf tests/results/*
 
 cleanspaces:
 	find ./sw/airborne -name '*.[ch]' -exec sed -i {} -e 's/[ \t]*$$//' \;
@@ -279,8 +278,5 @@ sw/simulator/launchsitl:
 	chmod a+x $@
 
 test: all replace_current_conf_xml
-	cd tests; $(MAKE) $(@)
-
-test_all_example_airframes: replace_current_conf_xml
-	cd tests; $(MAKE) $(@) TARGET_BOARD=examples
+	cd tests; $(MAKE) test