Merge branch 'master' into matthijskooijman-ide-1.5.x-timer-variant

Conflicts:
	app/src/processing/app/debug/Compiler.java
	hardware/arduino/sam/cores/arduino/main.cpp

Author: cmaglie