Sync with the d.o version.