Merge pull request #6302 from mikeller/increment_eeprom_version