Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension

Conflicts:
	build/linux/dist/tools/avrdude.conf

1 files changed, 1 insertions, 1 deletions

diff --git a/cores/arduino/main.cpp b/cores/arduino/main.cpp
index 097f5ed..0ef5256 100755
--- a/cores/arduino/main.cpp
+++ b/cores/arduino/main.cpp
@@ -13,7 +13,7 @@ int main(void)
     
 	for (;;) {
 		loop();
-		serialEventRun();
+		if (serialEventRun) serialEventRun();
 	}
         
 	return 0;