FlatSix911
Porsche 918 Hybrid
As pointed out in the Model X forum, the U.S. Model S VIN decodings have been updated here: ftp://ftp.nhtsa.dot.gov/mfrmail/ORG11229.pdf
Digit 7 is now Fuel Type: E = Electric. This seems like a waste of a digit as it's pretty obvious for Teslas, unless this is a precursor to industry-wide changes where fuel type must be consistently noted within the VIN.
Good update - thanks