Merge remote-tracking branch 'mc2avr/master'