merge of uploader from avrdude_serial branch