Renamed test3 -> test4 to avoid conflict with upstream
Merge remote-tracking branch 'upstream/master'

Conflicts:
	tests/run_tests.py