Release 1.3

This is just a few backports from master, fixing some errors in our data.