Merge in 'rfidiot'.