Resync with julietkilo/CANBabel