Sync with 8aec6d.