Sync with 1.7 README.