tolerate timeouts
merge bug25571 into stable
merge stable into default