merge bug25537 into stable
merge stable into default