Merge "Fix AVR compatibility."