Update to hg 3252:7e569a9cb5fd
merged official for an update