merge bug25543 into stable
merge stable into default