Merge pull request #853 from mc2avr/master