merge from master and avr tools
Merge branch 'master' into dev