Merge pull request #1183 from thess/avrdude-work