Moved to avr for 1.5