unbreak edoc
merge stable into default