Merge branch 'v0.5.0-beta-w.i.p'

Conflicts:
	Arduino_mega_2560/Arduino_mega_2560.ino