Sync with what appears to be the 1.3.0 release!