upgrade pde
merge from hg